(follow_key): When downcasing, downcase just the

basic part of the character, and preserve the modifier bits.

diff --git a/src/keyboard.c b/src/keyboard.c
index e79c64bfd552c5a2eb0adc290e65f0c913bd6131..e7e58365491b083a831a64bf8fdae6934c80427a 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3659,7 +3659,8 @@ follow_key (key, nmaps, current, defs, next)
       if (XINT (key) & shift_modifier)
        XSETINT (key, XINT (key) & ~shift_modifier);
       else
-       XSETINT (key, DOWNCASE (XINT (key)));
+       XSETINT (key, (DOWNCASE (XINT (key) & 0x3ffff)
+                      | (XINT (key) & ~0x3ffff)));
 
       first_binding = nmaps;
       for (i = nmaps - 1; i >= 0; i--)